Merge branch 'master' into ospath

author Joey Hess <joeyh@joeyh.name>

Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)

committer Joey Hess <joeyh@joeyh.name>

Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)
author Joey Hess <joeyh@joeyh.name>
Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)
committer Joey Hess <joeyh@joeyh.name>
Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)
diff --cc Git/HashObject.hs
Simple merge
diff --cc git-annex.cabal
Simple merge
author	Joey Hess <joeyh@joeyh.name>
	Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)
committer	Joey Hess <joeyh@joeyh.name>
	Wed, 29 Jan 2025 22:48:02 +0000 (18:48 -0400)
		1	2
Git/HashObject.hs	patch \|	diff1 \|	diff2 \|	blob \| history
git-annex.cabal	patch \|	diff1 \|	diff2 \|	blob \| history